Merge master@5428150 into git_qt-dev-plus-aosp. am: e24ee6719b Change-Id: I3954ad0578e3baf5b458166bf39b8096c2e40457